Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add resource metric integration test #453

Merged
merged 69 commits into from
Jan 28, 2025
Merged

Add resource metric integration test #453

merged 69 commits into from
Jan 28, 2025

Conversation

varunch77
Copy link
Member

@varunch77 varunch77 commented Jan 17, 2025 •
edited
Loading

Description of the issue

There is no integration test that verifies that an entity is being sent when we send resource metrics such as cpu and memory to CloudWatch—this is currently a gap in our testing.

Description of changes

  • Create an agent config to send resource metrics to Cloudwatch
  • Sign and send a request that calls ListEntitiesForMetric to get the entity associated with our metrics
  • Validate the returned entity
  • Update our integration testing IAM role to include permission for ListEntitiesForMetric

License

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Tests

Integration test run: https://github.com/aws/amazon-cloudwatch-agent/actions/runs/12838570212

varunch77 and others added 30 commits January 13, 2025 17:10
@varunch77
Create config file
3609cd7
@varunch77
Move config file
1952125
@varunch77
Add resource test
edd5418
@varunch77
Write logs
80975df
@varunch77
Attempt at checking entity information in logs
02c34c2
@varunch77
Revert to validating logs
2f93774
@varunch77
Pause deletion of logs for testing
a9c2c82
@varunch77
Edit config file
01c488a
@varunch77
Revert config change
044f757
@varunch77
Update config file again
5dbad82
@varunch77
Add memory info to config file
50e7764
@varunch77
Reduce append dimensions in config
dc78832
@varunch77
Update config
8e71d15
@varunch77
Revert config to minimal version
c763050
@varunch77
Another config change
49c83fa
@varunch77
Change namespace
db541b5
@varunch77
Update agent config
5689ad1
@varunch77
Use default namespace
a937887
@varunch77
Merge branch 'main' into resource-metric-integ-test
ad88aec
@varunch77
Codify curl command
ce01fa6
@varunch77
Unhardcode instance id
31ea8fb
@varunch77
Codify curl command
b8a54e2
@varunch77
validate request response
aa8f340
@varunch77
print type of response
ac08ce5
@varunch77
print type
17a05f2
@varunch77
Validate request response
92445d2
@varunch77
Add missing packages
cb15441
@varunch77
Update packages
aeb11ba
@varunch77
Fix package
7b412b1
@varunch77
Fix small errors
2f07084
@varunch77
Copy link
Member Author

Changes:

  • Removed anything logs-related
  • Moved the location of the test into the entity folder
  • Created a helper function in the util/common/metrics package to handle building the ListEntitiesForMetric call
  • Updated the entity validation to use existing helper functions

zhihonl
zhihonl reviewed Jan 24, 2025
View reviewed changes
test/entity/entity_test.go Outdated Show resolved Hide resolved
@zhihonl
Copy link
Contributor

zhihonl commented Jan 24, 2025

Can you attach a new integration test run with this change so we can make sure the test still passes?

@varunch77
Copy link
Member Author

varunch77 commented Jan 27, 2025 •
edited
Loading

lisguo
lisguo previously approved these changes Jan 27, 2025
View reviewed changes
test/metric_value_benchmark/entity_metrics_test.go Show resolved Hide resolved
zhihonl
zhihonl previously approved these changes Jan 27, 2025
View reviewed changes
@varunch77 varunch77 dismissed stale reviews from zhihonl and lisguo via ff409b4 January 27, 2025 21:02
@varunch77 varunch77 merged commit 9c7f0db into main Jan 28, 2025
2 checks passed
@varunch77 varunch77 deleted the resource-metric-integ-test branch January 28, 2025 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhihonl zhihonl zhihonl approved these changes

@lisguo lisguo lisguo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@varunch77 @zhihonl @lisguo